From f62365d27cbcb2130d0f69a85108d02cda70f22f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 7 Aug 2004 05:28:43 +0000 Subject: [PATCH] Make the column drag code a bit more robust (still scary, though). Sat Aug 7 01:26:08 2004 Matthias Clasen Make the column drag code a bit more robust (still scary, though). (#106992, Christian Biere) * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert that cur_reorder is NULL here. * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): Reset cur_reorder to NULL, and only hide drag_highlight_window if it exists. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ gtk/gtktreeview.c | 6 ++++-- 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6d60cd1d6..660f356ca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat Aug 7 01:26:08 2004 Matthias Clasen + + Make the column drag code a bit more robust (still scary, + though). (#106992, Christian Biere) + + * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert + that cur_reorder is NULL here. + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + Reset cur_reorder to NULL, and only hide drag_highlight_window + if it exists. + 2004-08-06 Federico Mena Quintero Fix #144232: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d6d60cd1d6..660f356ca9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Sat Aug 7 01:26:08 2004 Matthias Clasen + + Make the column drag code a bit more robust (still scary, + though). (#106992, Christian Biere) + + * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert + that cur_reorder is NULL here. + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + Reset cur_reorder to NULL, and only hide drag_highlight_window + if it exists. + 2004-08-06 Federico Mena Quintero Fix #144232: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d6d60cd1d6..660f356ca9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Sat Aug 7 01:26:08 2004 Matthias Clasen + + Make the column drag code a bit more robust (still scary, + though). (#106992, Christian Biere) + + * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert + that cur_reorder is NULL here. + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + Reset cur_reorder to NULL, and only hide drag_highlight_window + if it exists. + 2004-08-06 Federico Mena Quintero Fix #144232: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d6d60cd1d6..660f356ca9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Sat Aug 7 01:26:08 2004 Matthias Clasen + + Make the column drag code a bit more robust (still scary, + though). (#106992, Christian Biere) + + * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert + that cur_reorder is NULL here. + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + Reset cur_reorder to NULL, and only hide drag_highlight_window + if it exists. + 2004-08-06 Federico Mena Quintero Fix #144232: diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index b73f244b5f..8da9bfd248 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2559,8 +2559,10 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget, g_list_foreach (tree_view->priv->column_drag_info, (GFunc) g_free, NULL); g_list_free (tree_view->priv->column_drag_info); tree_view->priv->column_drag_info = NULL; + tree_view->priv->cur_reorder = NULL; - gdk_window_hide (tree_view->priv->drag_highlight_window); + if (tree_view->priv->drag_highlight_window) + gdk_window_hide (tree_view->priv->drag_highlight_window); /* Reset our flags */ tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_UNSET; @@ -8049,6 +8051,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view, GdkDisplay *display = gdk_screen_get_display (screen); g_return_if_fail (tree_view->priv->column_drag_info == NULL); + g_return_if_fail (tree_view->priv->cur_reorder == NULL); gtk_tree_view_set_column_drag_info (tree_view, column); @@ -8141,7 +8144,6 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view, gdk_keyboard_grab (tree_view->priv->drag_window, FALSE, GDK_CURRENT_TIME); - } static void -- 2.30.2